Merge "Localization of zen mode default rules." into oc-mr1-dev