Fix for Change Password dialog

Change-Id: I89985c212e5968d5ee2009aed664f070c91200b2
Merge "Fix for Change Password dialog"