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

* commit 'e9ce252cf0f7b996a2e1977d30928b0812e371ba':
  Turn on text display for debuggable builds