Merge "Migrate to public IndentingPrintWriter"