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

Change-Id: I1805b23929a56b5d54c660db7fdc5383233b3fe4