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

* commit 'e5c4e849e23721e90d4a42038925ae8484f5c850':
  Fix potential buffer overrun.

Change-Id: Icdcdd512ce2cde9b7a317dcd948cb2539e03f8d6