Cambio branch OmniSwitch

Change-Id: I8c1daca2f173ab6dc6a295f49777a948955e0c1a