am 6e8831cf: am 7450a32b: Merge "Clear the files we copy over to the temp cache" into honeycomb

* commit '6e8831cf2d7fd90ab124f58a9fc1919fac818887':
  Clear the files we copy over to the temp cache