track omniswitch from maxwen

Change-Id: Iae9b1adb5d3c8c2c3079cd2ab59ee4ddc4fb0dfe