Merge "Remove unnecessary WTFs from password state check" into pi-dev
am: 24ba8398fe

Change-Id: I8a8c66ba6bb0c83c1f57cfd48761863d3a8a4f72