Merge changes from topic "SPL-2019-04-05" into q-keystone-qcom-dev

* changes:
  [automerger skipped] Merge SPL-2019-04-05 skipped: f4f25b4d2b
  Merge SPL-2019-04-05