Merge "bootctrl HAL uses "default" service name"
am: cf1af460d5

Change-Id: Iae6ad548a1f3d10864daf95c05db05e5277f52ab