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

Change-Id: I49d67b47133fe4ab0d59481b38f4612f0fafd60d