Merge "Add option to set external temp dir"
am: b592e0da46

Change-Id: Ia36984739725ae8d2d202ea7a5c28521e31980b4