am c058154b: am c8039337: Merge "Change hard-coded temporary directory."

* commit 'c058154b747f295c98ad771d3dec4065749ee1a9':
  Change hard-coded temporary directory.