Merge "hwservicemanager: halserverdomain" am: 6456542f3e
am: 3d49330bed

Change-Id: I1ceaf1d95f07b8c4635a6055384cf6dcff932d51