am 6ac9c68e: am 67eac8d0: am ae5c0ad2: am cc4e84ee: Merge "Remove STOPSHIPs from GSA 4.0" into ub-now-porkchop

* commit '6ac9c68e4e214c57a69ae95f8c3a1f0cde27116f':