Merge "Make RankingHelper$Record.groups thread-safe" into oc-dev am: 892cd3e1e6
am: 769067fb99

Change-Id: I50b16c412bde9e8185336201a85fc487a56f11bf