Merge changes from topic "cherrypick-175809012-b8mkl2ku2v"

* changes:
  [automerged blank] Allowed primary checks should be case insensitive 2p: 99ae52c26a
  Allowed primary checks should be case insensitive