Merge commit '8a26e853' into gingerbread-plus-aosp * commit '8a26e853': Fix an issue of adding extra character.