am 3b8112ef: Merge change I280c753a into eclair-mr2

Merge commit '3b8112ef964eaafb3befa38d8b8ff767ea0f3751' into eclair-mr2-plus-aosp

* commit '3b8112ef964eaafb3befa38d8b8ff767ea0f3751':
  Modify text validation behavior.