Merge "hwservicemanager: halserverdomain"