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

Change-Id: I93d3eba418b98081eca6a2b0cabda58db5649057