Merge "bootctrl HAL uses "default" service name" am: ea69a18cd4 am: f5aecac914 am: 4139b36780
am: 305f4b30ad  -s ours

Change-Id: If39d079a39cafa8d446d9933c8176a81a3b9af63