Merge "Clean up on UserManagerService and DPMS" into nyc-dev am: 4ab36372fb
am: e1c87ee38b

* commit 'e1c87ee38b5cbb4e0a151968505ea6a6c244b56f':
  Clean up on UserManagerService and DPMS