Merge "Remove a non-obvious fall through in a switch statement." into jb-ub-now-kermit