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

Change-Id: I5d4cf03c1ecc81851a71d23f13adb02838d14bdf