Merge change I5ea630ca

* changes:
  Use a binary search for sparse switch statements.