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

* commit '74dc410bd19e07cde8702ad9c33dc1c25332d664':
  Remove StopShip from UserManagerCompactVl file.