Use new hybrid engine methods

Change-Id: Ief5fd6ad741b8ff25b6ddc120e47e6944e4c8c01