Hybrid toggle

Change-Id: I07d51c653c5d01fee2cba4100b35b9a09781eefd