Merge "Truncate trace output files." am: 09ab378326 am: d62093dae4
am: f114e0f7fe

Change-Id: Iae062a81f9da04a6dd47eb625df14a6b2c66e33c