Merge "Re-add tz code that was lost in java.lang.System" into nyc-mr2-dev