[automerger skipped] Merge "Fixed NPE in RankingHelper.writeXml. Make sure...

[automerger skipped] Merge "Fixed NPE in RankingHelper.writeXml. Make sure that mRecords is operated with the object lock." am: 51e5edcb am: 0eda9fd9
am: 3baf52c7 -s ours
am skip reason: change_id Ic7f676499425fe54453384d7c03de5d95c03a713 with SHA1 b24c62c9 is in history

Change-Id: I37b2a5f57464835fecc92992163c26cd5986c4fb