Merge "Fix implicit-fallthrough warnings." am: ad9708f570
am: dc607bc28e

Change-Id: Iac16279578a662fb03f3ddde75f57c38d16fae84