Merge "Remove unnecessary tests from RS build."