WaE: -Werror=switch

Change-Id: Id98fd0522403ebc5e175c3fdb2a6ce9e8f6ca4d7