Add OmniSwitch [2/2]

Change-Id: Ia2ced4315252e6a683b4852ec5a329d391914d2f