Merge changes from topic "am-dc1a52e7425a47ca812d8cb29e1b6836"

* changes:
  [automerger skipped] Merge "Enforce zen rule limit on a package level." into sc-dev am: bbc3447e -s ours am: e04ee4c6 -s ours am: b9844bfa -s ours am: 2dbc62d4 -s ours am: 503aa392 -s ours am: a78eb07c -s ours am: d3fa2ce6 -s ours
  [automerger skipped] Enforce zen rule limit on a package level. am: 34f2ef77 -s ours am: 63b69e79 -s ours am: edaa0337 -s ours am: 07b2eca1 -s ours am: 1da8ede9 -s ours am: 80067855 -s ours am: 0946502a -s ours