Merge "Suppress -Wimplicit-fallthrough." am: 31300f7276
am: 507c789494

Change-Id: I39e9d0413566f975f3e9069f043203519d69de91