lmk: backport patches from codeaurora 3.4