Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread