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

Change-Id: I512bf52260ab725632edc977fe30c8eabe7d2c75