Merge "Make RankingHelper$Record.groups thread-safe" into oc-dev