Merge "Adjust thresholds for pretty printing size."
am: a966376ac9

Change-Id: Ie0e5688f5ad50b8fe4d8047299c6a3ba32a88c83