am a905d955: am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread

Merge commit 'a905d9551103c5be465429ffeb0352b78058457e'

* commit 'a905d9551103c5be465429ffeb0352b78058457e':
  Remove STOPSHIP and reduce log spam.