Merge "Allow trace files to be zipped or text files."
am: 9a28fa0125

Change-Id: I629d73519af7db2ee5a404f26546a079c988e5ce