Add OmniSwitch

Change-Id: I5176fb9c71bb219b063251d464a26bf292e22e9a