Merge "Suppress -Wimplicit-fallthrough." am: 74d0fded75 am: 4f8f5703c2
am: b86722dd78

Change-Id: I2bc89ce1d242266d6f2c3a7e07d7de3257dbed1d