Merge changes from topic "presubmit-am-25573e946ece4fa1804202119abb6474" into sc-v2-dev-plus-aosp

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