Merge "bootctrl HAL uses "default" service name"