Merge "Suppress implicit fallthrough warnings." am: 225f99219c
am: 67bf08f56c

Change-Id: I524178fd45053a38090baa83c4597d41c986b0b8