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

Change-Id: I89a483054e1db43f51aa5ac790b867d5aee018cb