am 5e236b7d: am bd8d3e66: am e4c398d3: am 29e619c8: Merge "Remove a non-obvious fall through in a switch statement." into jb-ub-now-kermit

* commit '5e236b7d12c5eef34fb6a39a77437a6783dd8803':