am 93423259: am 74dc410b: Merge "Remove StopShip from UserManagerCompactVl file." into ub-now-porkchop

* commit '93423259c990af4b5ce7268c209cfa20bc6d36c2':