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

Change-Id: Iffc3ec9a106a7d93e02a8bbe83fbc178c0b09b50