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

* commit '63ef94e219bcce3e30e58ce652ab50da82c37323':
  Fix potential buffer overrun.

Change-Id: I723ccc1d805af664699ccb1964528fa506bca4cc