Fix handling of user password changes. am: 3c04bca28a am: 715b334915
am: adf0a51833

Change-Id: I912aa12908ecc59013221b2e033d58385573807f