Merge "Move TempDevice to test_util.h" am: 30820a384c
am: 66568bf4b0

Change-Id: Ia007b5169a6eeb6c8e8cd339096f5361b4a4c339