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