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

Change-Id: I68543167f1400b81e02a0741cb13993199d468f2