[automerger skipped] Merge "lmkd: Protect against buffer overflow" into pi-dev am: 136f765fb3  -s ours
am: f97f242c30  -s ours

Change-Id: I94f783d2f87f7590ee845c70ca27e437f0449cc3