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

Change-Id: Iec36d0074c6e5fd90c3f9b39d07feef89ddb4b31