Merge "DeviceSetup test for setTimezone"