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

* commit 'a6ecb61ee7a87af7153f11289d7df1eb6f1beb67':
  RankingHelper: Remove STOPSHIP