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

Change-Id: Ie5c44dd6a6559f82085d8e10e19d59e103d6b8d1