Merge "Rename external storage properties." into rvc-dev am: 884c64a052

Change-Id: Ia94b5339716ab5cc3f0ff055fbbf8edf34db01d0