am: 0e17e184 * commit '0e17e184': Fix potential buffer overrun. Change-Id: I2d0f7e326f21fd0fd2e8f03b2c7eda302730f4f9