...in preparation of eventually enabling -Wimplicit-fallthrough for Clang.

Change-Id: Idca352d011505e83dbe275cb19626c8b9d8560c8