updated to hybrid2

Change-Id: I16edd965d0a73ae86fe87dac0b2eb4729c08a351
Updated branches

Change-Id: I29401e95809d2d08fb47901c2956769e280a00ac