Merge "Remove functest-components from gates"