Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4e
am: 58eace4a96

Change-Id: I8b50cce19ece3b5082676c2ebb84164b78542544