Use new hybrid engine methods

Change-Id: Ief5fd6ad741b8ff25b6ddc120e47e6944e4c8c01
Version bump for hybrid 2

Change-Id: I4f69806afc9ad6e88d1bc0c4675b45ebafc42b97
Merge remote-tracking branch 'pa/hybrid2' into fjpa