Merge "Fix test failure caused by setting device to use 24 hour format"