merge from caf-apq8084 kernel source. This is modified files only#1

kevintm78 wants to merge 2 commits intocafvzwkevintm78/kfde:cafvzwfrom

cafkevintm78/kfde:cafCopy head branch name to clipboard