Merge "Merge SPL-2020-03-05 Change-Id: Id15f071f17d747d38c60b677a74c191fa5a4ce8b" into q-keystone-qcom-dev
mentioned in commit 854c8bfd