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

Change-Id: I827bed9cd0c57abb33c91af05a089f8f2f5d59fb