[automerger skipped] Merge "[DO NOT MERGE] Fix enum-compare-switch warning"
am: 25af42f8bf  -s ours

Change-Id: Iccbf88e16b0a3f8ba75a029848a3ff235176b2a3