Updated switches
Bug: 5076695

Change-Id: I003c279b8aa7914923c669f465c9a9ddf645972e
42 files changed