Add OmniSwitch [2/2]

Change-Id: I40257d61a2b2f743905623ba6a1c16019b40380c