Simplify use of temp working directory

Change-Id: Ibe0f8b5eb5b39e7bec7a8ce6002c88c800f7d786
Use local cache, leave user's alone

Change-Id: I877356e3aa00f3fa148fb50eb456187ed8c9f1b6
Merge "Simplify use of temp working directory"
Merge "Use local cache, leave user's alone"