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

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