am 28450902: Merge "Special case for SAT Display Text"

* commit '2845090227bee0b85fc08b6006eb8a75ebadf200':
  Special case for SAT Display Text