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

Change-Id: I17b0de9d6cb56a397202b033b1c6dff8715e7f50