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

* commit '06a3c6d32c0c70457c7eb5eccf3395e867fb3b61':
  Calling method in DPMS after resolving userId