Merge "soc: qcom: port some changes from kernel 4.4"