Add OmniSwitch [1/2]

Change-Id: I705b83f11da880f1a70ce1e6b9e95e507545596d