am 3f6e4d56: am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread

Merge commit '3f6e4d56bba393ac556a672202e00bc417784ce8'

* commit '3f6e4d56bba393ac556a672202e00bc417784ce8':
  Don't fall through from TOKEN_EMAIL_LOOKUP