-Werror,-Wswitch

Change-Id: Iad8c17f8d69d51d55c6cdf2ed355cda140399337
-Werror,-Wswitch

Change-Id: I807b63361af2e40c4adf66412615b91b5d610dab
-Werror,-Wunused-private-field

Change-Id: Ic090eee9e7705baf2c44fa2990a986e06cd0cf68