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

Change-Id: I79d517733e827f78d3197150a87f6a3daadfcc87