Merge "Update location of trace files." am: 1491521a68 am: 9a2cc418cd am: e59e3614fa am: b74f539ff0
am: 2d85120b1c

Change-Id: I8cef559c16a99a2386f4fcc3668d344a2f60b393