Merge "Pin lmkd for real" am: 625d1383d3
am: da0d209ba1

Change-Id: I774bef622b77a1cfb5cfd1b8efbe0e2bb92ea422