[automerger skipped] Rename external storage properties. am: 94abf26ba2 am: e326e59dde -s ours am: ca78448fb6 -s ours

am skip reason: Change-Id I64c6d8ca49fbd72f923a8794df0929bd500dd8e9 with SHA-1 5a4a7fffb7 is in history

Change-Id: I41c9738428ca91bfea32fcb912286fbff4239ae4