Merge "Add a new constant to TimeZoneRulesDataContract" into oc-mr1-dev