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

Change-Id: Ie3c2eff56a731243eeff673ced6226548ed63633