Merge "Update comments in IServiceManager." am: a3e4486e1d
am: 2cebc7f6da

Change-Id: I1a700e02d136979c443173c88a4f23d2140bc124