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

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