Merge "Rename external storage properties." am: 014e1d7b06 am: 7a530e102d am: 7323ae7f90

Change-Id: Ic6747d77a3dccda24a2006689c39e116503923dd