Merge "Revert "Fix warnings in servicemanager and KeyCharacterMap"" into nyc-dev
am: 3f0d762955

* commit '3f0d762955d4478256848fef92f7c5b105ff1509':
  Revert "Fix warnings in servicemanager and KeyCharacterMap"