Merge "Removed some deprecated APIs that use List instead of Set."