Merge "Merge SPL-2019-12-05" into q-keystone-qcom-dev