Change 'and' to 'or'

Reviewers: eater

Reviewed By: eater

Differential Revision: http://phabricator.khanacademy.org/D9027