Merge "Add Kotlin objects as-Java to toc"