Merge "bootctrl HAL uses "default" service name" am: cf1af460d5 am: ee3030ad4e am: 58eace4a96
am: e218ca21d5  -s ours

Change-Id: Ifbb2ff93fe76fd71ee4f1d80eeaf48225b7335f5