Merge branch 'googletest_policy_settings' into release-3.12

Merge-request: !2237