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