Fix enum switch warnings am: 248ec3da8b am: 1c74c66219
am: 3a69a4a432

Change-Id: I766feb96c1aa2576801723552509b07338ce8937