Merge "Allow implicit-fallthrough warnings locally." am: e45fc974db am: 7da8404d40
am: f68d1864d9

Change-Id: Id3dfe43b6d433e7cc627d294e7397622fa680897