Merge "Fix reboot loop when "password to boot" is enabled on ..." into nyc-dev
am: 8318223a6e

* commit '8318223a6e2a8d5d8b39e0a81ce6fe09150ae100':
  Fix reboot loop when "password to boot" is enabled on ...

Change-Id: Ic65eb1cde386c9175dd2bfe46384e13ef22dbe67