Merge "Fix CTS for DPM.resetPassword()."