Merge changes from topic "SPL-2020-03-05" into r-keystone-qcom-dev

* changes:
  [automerger skipped] Merge SPL-2020-03-05 skipped: 799030b703
  Merge SPL-2020-03-05