Add OmniSwitch [1/2]

Change-Id: Ifd20a389fa47acf1ff32c2a6a77813c15666096d