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

Change-Id: I546a2d8c351293b7f07505bea1df77ac84f4475e