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

Change-Id: I6bbd357754c487873bea427fe113452f764c7098