Fix potential buffer overrun. am: 38025bc7 am: 805b415b am: 0e17e184 am: 8e37aa19 am: e5c4e849 am: 46464a20 * commit '46464a20': Fix potential buffer overrun. Change-Id: I180bcd9b425711745406725a2906f4854b7f3706