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

* changes:
  [automerger skipped] Merge SPL-2019-02-05 skipped: 8db7205d89
  Merge SPL-2019-02-05