Merge "Calling method in DPMS after resolving userId" into nyc-dev
am: d7924b6063

* commit 'd7924b60635d62f2df888b53dc3ef27d9947133c':
  Calling method in DPMS after resolving userId