Merge changes from topic "presubmit-am-edb9e31c38704f8a922e0a1b4ba0055e"
* changes:
[automerge] Small fixes for reset password token 2p: fc41b723 2p: 9b79d8ce
[automerge] Small fixes for reset password token 2p: fc41b723
Small fixes for reset password token