Merge "Fix potential buffer overrun."
am: 1916535

* commit '19165357272e58b4b74a54bda8d83e1a769e898e':
  Fix potential buffer overrun.

Change-Id: I3d8a47eb7d947b5d142a733d27879913d62abd0d