Avoid spaces in the trace file names. am: bb3ff15495
am: 3893042944

Change-Id: I45db7f35780f0f5ca82bdad10da8c865c6ce4f30