Merge changes I53d70510,If34a05f3 into jb-mr1-dev

* changes:
  add support hwc 1.1
  refactor things a bit