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

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