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: d3373750
am: 924c9b5a
* commit '924c9b5a':
Change-Id: I9ebf1cf5b948476a52f5ebd7b0eb15c8fc12f59b