Add OmniSwitch [1/2]

Change-Id: I26ecd7a51180357737f6b1b88769fa52c17456a8