Merge "Merge SPL-2020-02-05 Change-Id: Ib0acfa2195086d600eb08d6f703997818c0bd29b" into q-keystone-qcom-dev