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

Change-Id: I1a6727f0f5d9da4923a445a0e19b871737e33cdc