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

Change-Id: If39cab9fa0cbab8d997492c2be9962ea519eaef7