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

Change-Id: I5642305d06b15548390589cad7cce56e7f851ec7