Merge "Update for namespaced services in hwservicemanager." am: 605df82c am: 3dcee988 am: 1a384933 am: 97186e09 Change-Id: Idc856de883500636be54f91d7529a1cc82c7313e