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

Change-Id: Ic2edc84d54098776e0de672a7eb0d2cee95d5be1