am c1a1937c: am 2220aeed: Merge "Put temporary files under a separate directory." into jb-mr1-dev

* commit 'c1a1937c0d079aec18cec992dc5010b409f8fcbd':
  Put temporary files under a separate directory.