Merge "[DO NOT MERGE] Update kernel timezone if call to setTime causes DST offset to change"