Merge "[DO NOT MERGE] Fix enum-compare-switch warning"