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

Change-Id: Idf016ff7cf321c1d8ceda7cba3605b93bd721d9a