Merge "Suppress implicit-fallthrough warnings." am: 7c1aa36d10
am: 4c2e5755ba

Change-Id: Iae0fd47ea7a3e725f6a809c4ddba7d5fc1649558