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

Change-Id: I6633a39978417d5f9380b374fa62d922e923ae52