Fix enum switch warnings
am: 248ec3da8b

Change-Id: Ib581466c7f514ee89d8b902eb86d9e6b33e21753