Merge "Replacing deprecated APIs" into q-keystone-qcom-dev