Fix potential buffer overrun. am: 38025bc7fa am: 805b415be6
am: 0e17e18496

* commit '0e17e1849633b07c019daf89c0d2ededc1333f3b':
  Fix potential buffer overrun.

Change-Id: I2d0f7e326f21fd0fd2e8f03b2c7eda302730f4f9