Merge changes from topic "mpr-2021-09-05" into s-keystone-qcom-dev

* changes:
  [automerger skipped] Merge mpr-2021-09-05 skipped: 411520c727
  Merge mpr-2021-09-05