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

Change-Id: I1ce7232dd42a4c7d9c6f0d8053dc1479f3335577