Merge "Clear "Wrong pattern" prompt automatically." into oc-mr1-dev am: 1d6cec8ca2
am: 59bc90954b

Change-Id: I0df8958420b72cbcf135d2aad5c095e3c10e1e06