Merge "Allow implicit-fallthrough warnings locally."
am: 517a57bde3

Change-Id: I3f6a5f66a481955741be0f9d31a6c7f3f31adf05