Merge "Suppress -Wimplicit-fallthrough."
am: f9739a5f6e

Change-Id: I98ce979888eb6cd6075cb61b494c9b343322348e