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

Change-Id: Iaf3f580af7b8e3bc7a4bfb7a9d5344bb37ab4dc6