Remove STOPSHIPs and a bit of debug logging

Bug: 3396875
Change-Id: I3e874e28c3412aadd9851000a83d69fc8c06aeb9
3 files changed