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

Change-Id: If625dc1bae06d2f8fc0e8203c984df1db2f537e7