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

* commit '3bbe8817e6dbfcb64ea7a02fa46be533ce5718ab':
  Fix potential buffer overrun.

Change-Id: I4b76d9d081fe87c207fc1a6f4832e3af969d7816