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

Change-Id: I052abfd7e78ddae1b63490579736136c434cdfaf