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

Change-Id: Ic1687f3b78ba2b3be689eb9462f568e7a68c54d8