Merge changes from topic "presubmit-am-25573e946ece4fa1804202119abb6474-sc-dev" into sc-mainline-prod

* changes:
  [automerged blank] Do not verify field count in tests used in CTS 2p: 81209cff57
  Do not verify field count in tests used in CTS