am 09d33a54: am 3b8112ef: Merge change I280c753a into eclair-mr2

Merge commit '09d33a54a6b4244223f7d51f5c0764b6ad3f808f'

* commit '09d33a54a6b4244223f7d51f5c0764b6ad3f808f':
  Modify text validation behavior.