omniswitch: track from other branch (official one as it gets merged official into omni)

Change-Id: Ifa634c9447dd925ef9fb071e466677299e991934
Merge "omniswitch: track from other branch (official one as it gets merged official into omni)" into kitkat