Merge changes Ia2dd6bb1,Id1220b03 into nextgenv2 * changes: transform tests: Avoid #if inside INSTANTIATE_TEST_CASE_P variance_test: Avoid #if inside INSTANTIATE_TEST_CASE_P