am 4f456018: (-s ours) Merge "Fix some STOPSHIP logging DO NOT MERGE" into ub-mail-algol

* commit '4f4560189d46511af7787461d5ec7a15c08d3f7e':
  Fix some STOPSHIP logging DO NOT MERGE