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

Change-Id: I6859c9a8b27358e1c35ca16948ff6e52ba229f80