Merge "Do not verify field count in tests used in CTS" into sc-dev