Merge "Making time-zone an API constant" into rvc-dev