Merge changes from topic "TemporaryDir rm -rf"
am: baa4818925

Change-Id: Iaaa5d65721ed65d8b30f6e9d398b79b5e3e09072