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

Change-Id: Ie9fd8324f06314536b169a6d79e80453bc6f503a