Merge "Fix reboot loop when "password to boot" is enabled on ..." into nyc-dev...
Merge "Fix reboot loop when "password to boot" is enabled on ..." into nyc-dev am: 8318223a am: 30ead056
am: b673fcf0
* commit 'b673fcf0':
Fix reboot loop when "password to boot" is enabled on ...
Change-Id: Iebee0e188b2cb26d2215de838c68e11d5005744c