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