Merge "Fix race condition in checkPattern and verifyPattern." into cw-f-dev am: 1e746a415d
am: fa97f0edb8

Change-Id: I3a755ed276ed60fd50f4e8896091012f43834732