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

Change-Id: Ib7a49730cd16828a6065c78c8c529ff252444b7d