[automerger skipped] Merge "Use JUnit TemporaryFolder instead of *IoUtils.createTemporaryDirectory()" am: b63261b60a -s ours am: ba293832e9 -s ours am: 41f7dd1cea -s ours
am: 47984576b3 -s ours
am skip reason: change_id Ia21ceb26c965dbdb6565a5a1a24142cf0cf51d7a with SHA1 5c3e9d65e3 is in history

Change-Id: I80c20611d56461dd16c3266405799460b16f89d0