am 51347595: am a6ecb61e: am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev

* commit '51347595a3ea7749b2c771ac1e8f8f729a55e1a9':
  RankingHelper: Remove STOPSHIP