OmniSwitch: fixes required after upgrade to LP

Change-Id: I7ffc83c8f16aae2e9770067a8a66bb8a27f1d759