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

Change-Id: I203a4c4dad2ec56eee5206e029466c5769482f8f