Merge "Refactor RankingHelper to separate out PreferencesHelper."