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

Change-Id: I97e7c14ab15cf0af6e61410ea26164447300297b