Merge "Fixed NPE in RankingHelper.writeXml. Make sure that mRecords is operated with the object lock."
am: 51e5edcb9b

Change-Id: I4f57eb27caffbf6462dcad23660f05efce21e74e