Merge "Fail gracefully if password reset token is invalidated" into oc-mr1-dev
am: 223a65f3f5

Change-Id: I3bba8e337fe57999daf1e7d8ff90a9f7bfc6831d