Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev