[automerger skipped] Merge "Allow implicit-fallthrough warnings locally. DO NOT MERGE."
am: e1a209a6a9  -s ours

Change-Id: I975ae8909f92b6fb588e75ec4a317ae88959e3c0