Merge "Making time-zone an API constant" into rvc-dev am: 59218138 am: 078c8710 am: 66899954 am: 67e446a9 Change-Id: Id136132ca41a7141f6d073fb486cc9da73ed59df