am 0a7b9276: am f8f88321: Merge "Turn on text display for debuggable builds"

* commit '0a7b92762a42be7dd01da87b5f67a405f6f07d31':
  Turn on text display for debuggable builds