hwservicemanager unit tests am: 501bc8eeaa am: 7dfb0184a0
am: 6bd75832fc

Change-Id: I61a252e35f5942ba97ae1effe7eefb3ddc80dced