Make the switch switch

Change-Id: Id7931700f98e1061f253d0bfb344fae7716f88d6
Merge "Make the switch switch" into pac-4.4