Merge "lmkd: Avoid potential out of buffer write" am: 3d8fbfada6
am: 40aeb3c740

Change-Id: I7edc060bacde028ffed27c0214dbd26868803812