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

Change-Id: I2b06e8abc6d47f562fa553660f18f248bffa1094