Merge changes from topic 'wrong_password' into oc-dr1-dev am: 702d4d56fe
am: 401bc81643

Change-Id: Ifde0b33aea41555501132855af4650d1ca2a9d5c