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

* commit 'ee741270dd0c70f12a36a70c72dfeed428f1f273':
  Fix warnings in servicemanager and KeyCharacterMap