[2/2] Added OmniSwitch

Change-Id: I57cbe8fd8dbdfb8fbc620db990ff0f4db84ea500