Merge "Measure external storage using new GIDs." am: f5a21ba425
am: 973d5aeb17

Change-Id: If3e585b5a35faa1f0151351affa23b382976dc4a