Merge "bootctrl HAL uses "default" service name"
am: ea69a18cd4

Change-Id: If08bbb1e45369083dcbea731005b035f026c238d