Merge "Ensure that service_manager adds / finds make sense."
am: c2be630c3a

Change-Id: I590206e3de5fb68d19d7ed9f3c03d2589b80c2da