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

Change-Id: I4bdc09bd3e62dfbc522b527537bcd526a391fbaf