Merge "Fix typo in RankingHelper." into new-mm6.0