Merge "Suppress -Wimplicit-fallthrough."
am: 7bbf579700

Change-Id: I6dc763498d36e8cc1e1448d42e7635fb6c65e60d