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

Change-Id: I543fd7b44ff61dd7e45dc3e6b82827673f5c51c8