Merge "Reduce log spam when RankingMap is missing rankings for non-cancelled entries." into tm-qpr-dev