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

Change-Id: I39a58e12dc3f642b23e451ea45c34a582ee2b310