Merge "Turn off additional logging in text rendering" into nyc-mr1-dev
am: 9fe5b1129e

Change-Id: I013fc2d7781c4f17beb9ac99c654bb65880adb6f