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

Change-Id: Ie4239e5f7459b495446dae3dec0ddf38dfea5b4a