am: e5c4e849 * commit 'e5c4e849': Fix potential buffer overrun. Change-Id: Icdcdd512ce2cde9b7a317dcd948cb2539e03f8d6