Merge "Suppress -Wimplicit-fallthrough." am: 8704782ffd
am: fa1ce53961

Change-Id: I17099cda4a919b28aab856fffbb843609bf56cf9