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

Change-Id: I7b322ed1e009ba6fbed5b38e82ad793a3f450ba7