Merge "Use non-extended mockito for net-tests-utils" into main