am e28ccbab: am 7a082985: Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"."

* commit 'e28ccbab9a5634b6d9557240161310451c660e47':
  Fixes an issue that occured unexpected exception "pointerIndex out of range".