Also updates the switcher to match the latest redlines. Bug: 16406694 Change-Id: Ibf44ed9ea2ef4e3c467724eb4c79f1df5b3e49f4