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

Change-Id: Id0e88b2142ed03de2ba9aa409368c6515c183ef8