Merge change 9550

* changes:
  Fix the missing break statement.