Merge "Merge SPL-2020-02-05 Change-Id: I0da42763718738ff6d2aa2ccedd03038de0bef11" into q-keystone-qcom-dev
mentioned in commit 85894da8