Merge "Ensures zen rule update locale retains enabled val" into oc-mr1-dev
am: 438a8e9e1a

Change-Id: I06d7b5d565e8713b2e3e91d9845581fbe0fd62a2