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

Change-Id: I232671cc125875cdbe47067d2d2022966718d180