Merge "IServiceManager: use constant expressions" am: dbaed0ac91 am: e18eefc96f am: 242ff99af1
am: 1121b1e7ba

Change-Id: I114af07d34660ec59a925bfd9cd6756e73bde57a