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

Change-Id: Idcd715d90a479f7912736eca2ff880dea46fcddc