Merge "Improvements to lmkd" into oc-mr1-dev