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

Change-Id: Ie1011f5c27008e50cdf9430669ef1d3ceb1f38e9