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

Change-Id: Ie6fdce86c133bf54f8bce79593d8fbe3d9ead914