Merge "Ensure that hwservice_manager adds / finds make sense." am: f21085ca29 am: 4aa9123f1b
am: 5688729fd5

Change-Id: I2e121886c46909e8148f65e5e4980af797733295