Track OmniSwitch

Change-Id: I24846c8500c426a609456c4cf61b8244bd1a1447