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

Change-Id: I36dec49a567400d1acf6e13567de3f76319f91be