Merge changes from topic "QP1A.190306.002" into q-keystone-qcom-dev

* changes:
  update method which no longer returns an int
  Merge QP1A.190306.002