Merge "Localization of zen mode default rules." into oc-mr1-dev am: 15ea142044
am: 516be39336

Change-Id: I26fd676a9cb96d0de3f9be715a4fb4591ef031c8