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

Change-Id: If11d63678c0c8a8259688971d0b4b156b4eefdbe