Merge "Fix implicit-fallthrough warnings." am: c1ddd1b231
am: 463aedbc1e

Change-Id: I4951ab536ba06ae19864d373a6383b67c5a993f6