Merge "Tweak javadoc of setResetPasswordToken" into oc-dev am: ae23290ef5
am: b9b4825c8b

Change-Id: I5afb297b9a4718ac26ae2051dd6bb75338794d06