Merge "Suppress -Wimplicit-fallthrough."
am: 00cbbb5b3e

Change-Id: I761c8f7fbcd136a9a5c968487502b5aa792c8991