Merge branch 'backport-GoogleTest-value-parameters'