[1/2] Added OmniSwitch

Change-Id: I5ff2c5c39ef839ef563dd12a34666719ffab0190