Merge "Fix setAutoTime and setAutoTimeZone test failures"