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

Change-Id: Iced41d9d4d5ccc146e044de68046b8ee48d2fc52