Bug 976009 -  Address intermittent in test _unlock_to_passcode on Travis
Merge pull request #16566 from zacc/bug_976009

Bug 976009 -  Address intermittent in test _unlock_to_passcode on Travis