Merge "Suppress -Wimplicit-fallthrough."
am: 74d0fded75

Change-Id: Ie81d9303a7092abb83b4618700b18d4dde42c689