lmk: port from fuji 3.4

let's hope this is better than our current lmk

Change-Id: I285c1efc6e326eec489a12e080cd09875829b878