Fix potential buffer overrun. am: 38025bc7 am: 805b415b am: 0e17e184 am: 8e37aa19 am: e5c4e849 am: 46464a20 am: 3bbe8817 am: 63e01f73 am: a0af385a am: f984fa7d * commit 'f984fa7d': Fix potential buffer overrun. Change-Id: I6c172e5a2e5b1f236b61351d92dc98357a22b892