Merge "Fix Kotlin warning (IndentingPrintWriter)"