Merge changes from topic "am-4994b984e56b4850bfda0ec9cdf49b4c"

* changes:
  [automerger skipped] Merge changes from topic "cherrypick-jr-owner-azffbn1bzv" into rvc-qpr-dev am: 935664ad -s ours am: 46eea361 -s ours am: 2584177a -s ours am: 148ba47a -s ours am: 5e9f5916 -s ours am: dfb11784 -s ours
  [automerger skipped] Enforce zen rule limit on a package level. am: 76c78aa2 -s ours am: 8d65fed6 -s ours am: b528fb0a -s ours am: 5ffaa444 -s ours am: aa41aea5 -s ours am: c86379c6 -s ours