Merge "Synchronize access to ranking helper records." into oc-dev am: bf777d46f2
am: 00ac29e3dd

Change-Id: Ic6fec9eda6c3302d4893c6f5929ba5d8e8341850