Merge "IServiceManager: check constant values consistancy" am: ed8f129423 am: 0bfd7133da
am: 303d8dc892

Change-Id: I64806eea2d784c27ca6c9403213669aa4e245cad