Merge "Merge "Allow implicit-fallthrough warnings locally." am: 36afe11a64 am: 9c5738238d am: 469705cca4"