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

Change-Id: Id8684a3ce220d9d117d1538f8aaff2029a7a2a54