Merge change Ieef539c3 into eclair

* changes:
  Fix a potential IllegalArgumentException caught by monkeys. #2176776