Merge "Suppress -Wimplicit-fallthrough."
am: 6db9b4a01a

Change-Id: I9a6466d9d18e04fd9f9310b6e4a017333e2822c5