Merge "Suppress implicit-fallthrough warnings."
am: 16fef65f9e

Change-Id: I71bdcd891f5d41fb90a9e7726aecbf2decdeed2c