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

* commit '29e619c8545dcc898846f6d2a58adda14c9da03a':
  Remove a non-obvious fall through in a switch statement.