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

* commit '7450a32bab8945738589d7b323953cdc80de111f':
  Clear the files we copy over to the temp cache