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

Change-Id: I5360a7f9e03f4eb47c288bd19a62c315973f6398