Merge "Merge 'passwordreset-pretext' and 'passwordreset-text' messages"