Merge "DPMS: Passing in the right user ID for password checking"