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

* commit '8e37aa191ff8c9099efa24800048c08afe0b53cf':
  Fix potential buffer overrun.

Change-Id: I30bc81276880e8816387a6b3d242015988a2b305