Merge "Improvements to lmkd" into oc-mr1-dev
am: 5f89f548fe

Change-Id: I848aeeea7de9020581c3e4c79aef38204c82989d