am 5de04119: am 0f8ec44b: Merge "Prune shared users that the system declares but does not use" into klp-dev

* commit '5de041193cec58e8ee40a62c760b24141455b2f8':
  Prune shared users that the system declares but does not use