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

Change-Id: I9aef0811516968d82ef464e2374b845972bdd696