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

Change-Id: Ifd8aba7ab5deb077f6dfc596ce5c6ae92cf5dc73