Merge "Lock pattern should be red when error" into oc-dr1-dev am: b02cbdeeb3
am: f7ea0557b2

Change-Id: Iafeafcf7c465b5914ec300c034cde42299db9d7e