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

Change-Id: I4cb5ea83912112ed458d538997a0e70ad967673b