am 230a5d1f: am 1758bc3c: Merge "Remove STOPSHIPs." into honeycomb

* commit '230a5d1f045e0de321de64effa5b2aa87c92cf76':
  Remove STOPSHIPs.