Merge "Move TempDevice to test_util.h"