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

* commit '67eac8d023e38dd0be0889a4d2f2ca57cfe48d4e':