[automerger skipped] Fix implicit-fallthrough warnings. DO NOT MERGE.
am: a4fd568a79  -s ours

Change-Id: Ie5c983992a34a116dc638a7864c55f7c8a0b4adc