am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev

* commit '6f0cf112a712cd1a9e77a9b2b66e5f771d4e061e':
  Addressing API council comments for UserManager.