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

Change-Id: Ia02534a8d23cb857ac0994bca9261aed5696bae7