Merge "Update comments in IServiceManager." am: a3e4486e1d am: 2cebc7f6da am: 322b90c13c
am: 913f35146f

Change-Id: I6823ce1d0190ada26d8d087f5f66bd1580f7afd1