Add OmniSwitch [2/2]

Change-Id: I033e30c5a14610c49786948644414abedb0bc244