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

Change-Id: I82706b8902d3ea69d2474779ac3e9e52eb121b1a