-Werror,-Wswitch

Change-Id: I7d7a616dc843c434dcd2586ccdb9cb48b961e4c4