Merge "lmkd: use after free" am: 7c3c8c27e1
am: c95fb64f0f

Change-Id: I14be93f1bb37bab59b68c874017c4979cf9655db