hwservicemanager unit tests am: 501bc8eeaa
am: 7dfb0184a0

Change-Id: I01293f82e588eace30c1cfc770a946829a34bd79