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