Merge "Add systrace details to storage measurements."