Merge "Measure external storage application usage" into honeycomb