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

* commit 'a0af385aae066ee3e3b5414b4dbeb5acb03b3e9e':
  Fix potential buffer overrun.

Change-Id: Ic52a3476c569227eb2146b4ac653fb8a3f58e068