Merge changes from topic "am-f77f5991f56f4f61b3596258ce67ff9d" into udc-dev

* changes:
  Merge "[automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: fcc640c5 am: b5e74c1c -s ours am: 8cfe99d2 -s ours am: 167fa8ba -s ours" into sc-dev am: 8449f44b -s ours am: 3e44a311 -s ours am: c78b6a44 -s ours am: 98d86fba -s ours am: 90335ee1 -s ours am: b525efb1 -s ours
  [automerger skipped] Check rule package name in ZenModeHelper.addAutomaticRule am: fcc640c5 am: b5e74c1c -s ours am: 8cfe99d2 -s ours am: 167fa8ba -s ours am: 8583d6ea -s ours am: 88358495 -s ours am: fc437879 -s ours am: 26fa6097 -s ours am: 7f86a685 -s ours am: 3dd34f4f -s ours