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

Change-Id: I388476c2d7f7a427bc2f00caa515bd114072ee0d