Merge "Revert "Revert "Fix warnings in servicemanager and KeyCharacterMap""" into nyc-dev