Added hybrid mode

Change-Id: I114b6a268cd7239aa0c4cfd9064a4680d041dddb
Merge "Added hybrid mode" into jb-mr2