am 8a26e853: Fix an issue of adding extra character.

Merge commit '8a26e85387d7fb964b76af502a6e89574d85d58d' into gingerbread-plus-aosp

* commit '8a26e85387d7fb964b76af502a6e89574d85d58d':
  Fix an issue of adding extra character.