Merge "Clear the files we copy over to the temp cache" into honeycomb