Merge "Merge "Pass correct userId in resetPasswordToken" into udc-dev am: 1e40898e34 am: 02070a1ce3"