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