Merge "Ensure that hwservice_manager adds / finds make sense."