Add OmniSwitch [1/2]

Change-Id: I50bfa56f8df7d359f8ff246e63d67c4556a843b4