am eb772880: am 59778b3c: am db7ae10d: (-s ours) Remove STOPSHIP BT logging.

Merge commit 'eb772880e3e0ca472fc632af19543a8b17a03598'

* commit 'eb772880e3e0ca472fc632af19543a8b17a03598':