Use new hybrid engine methods

Change-Id: I7ead0a39b2726865080d7aa633b2cfe7b2e96eec