Merge "Ensure that hwservice_manager adds / finds make sense."
am: f21085ca29

Change-Id: Ie17c0cd5bddf23e0890a8fecbbe29e755d6203d3