Merge "Update for namespaced services in hwservicemanager."