Merge "Update comments in IServiceManager."
am: a3e4486e1d

Change-Id: I71922648fefa9fe156b4f126a569469acecc6f12