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

Change-Id: I272a6440b4bd7178dd055e20d6a34e7dbeba1fa6