Merge "bootctrl HAL uses "default" service name"
am: 9877cf296f

Change-Id: If2f51ace994cc926bdd8e65afe11b708f7dab816