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

Change-Id: Iee32ea7044ea873700aed942c493ba7d1dc033a1