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

Change-Id: I37efa4372b36d97e0fbbac362d74e66957eca569