Merge "Do not suppress severe exception when password change fails"