Avoid spaces in the trace file names.
am: bb3ff15495

Change-Id: Id9c8733c21f9aaee286519e45647c57067cc5b1b