Merge "bootctrl HAL uses "default" service name" am: 9877cf296f am: c68beb8712 am: f6835e18ef
am: f8fd472a50  -s ours

Change-Id: I320558eb3b6dabebb3c5b05a2d6633e9355f952c