Merge "base: TemporaryDir add DoNotRemove() method" am: 2979d385cb am: 873f417b3e
am: f904dcdad1

Change-Id: Ia69a5c96490cb540bfd6f73b3e90e7897be54837