Merge "Revert "Revert "Fix warnings in servicemanager and KeyCharacterMap""" into nyc-dev
am: 4318b9c88c

* commit '4318b9c88cca12485082687658ee3bab5ecd9013':
  Revert "Revert "Fix warnings in servicemanager and KeyCharacterMap""