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

Change-Id: Id8f48276b4768a9e49b943e7142c33d7a365374a