Merge "Lmkd: Fix unused variables"