-Werror,-Wswitch

Change-Id: Ia787aaca4a5ec4af37063e35e96c8aba06bdd8fa