Merge "Update for namespaced services in hwservicemanager." am: 605df82c9e
am: 3dcee9882d

Change-Id: I929f34098061e084f1d9a92070179351c65d5acc