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

Change-Id: Ia51be3f19a1e35ff9cbb27601a527014b2f0b1f8