Merge "Add systrace details to storage measurements." am: a693382d94 am: b0858a472e
am: 6248cde3b3

Change-Id: I2d259e341128528ef0d81e9dea4631527efd48dc