Merge "9300: kernel : make some changes for ESD" into mnc-dr-dev-qcom-lego