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

* commit '46464a20e0f4f5ec22e1ca9c5fb9d7f603295f5c':
  Fix potential buffer overrun.

Change-Id: I180bcd9b425711745406725a2906f4854b7f3706