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

* commit '52985def455cd7d5875ca77bff3f6f18cde42900':