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

Change-Id: Iad0ff999b93d51b0f751a18635dfd967cc94a1b5