Merge "Fix linter NewApi warning for Set.copyOf()" into sc-dev