[automerger skipped] Merge "Fix implicit-fallthrough warnings. DO NOT MERGE."
am: 46049f5fec  -s ours

Change-Id: I366311d65ed2fe7bc62203869782606c3762e3cc