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

Change-Id: Ib73e3a27a61932825b94128a77854a08b66a8977