am 333f34c6: Merge "Removing STOPSHIP comment that is not needed (per bug)." into lmp-mr1-dev

* commit '333f34c6daa46ff72015680d4e9b0ada33979d93':
  Removing STOPSHIP comment that is not needed (per bug).