Merge "Prefix temp files to ensure they are cleaned up" am: b504c8f1b2 am: d288c44654
am: 0b80313260

Change-Id: I0d5772c4ce26e9f1b3c7b8d517ed962345cfcf02