Merge "Fix handling of user password changes."
am: 946f1d11c0

Change-Id: I977f1ebc111c91f3f50ff1fe696162e05ac89e81