Merge "hwservicemanager is not a HAL" into oc-dev