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

Change-Id: I5d16b3f8c55b2c683dfa8689d838ab0b5fd25eb9