Merge "Fix implicit-fallthrough warnings." am: 8f520e6f83 am: a6c90c99cd
am: bd0093e182

Change-Id: Idfda76fbd502f84ac7abb9315d6fff9e923fdefd