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

Change-Id: I0a8803682ec00a85583bb82e0505335318571a2d