Merge "Add external_storage gid" am: 8e4cf5b436 am: ed326eafc0

Change-Id: I5561270960b2fb4170498c9cb107de279b887163