Merge "bootctrl HAL uses "default" service name" am: ea69a18cd4 am: f5aecac914
am: 4139b36780

Change-Id: Ifb5748b68c622e37e60a7a32f4bf090e5412605d