Merge "Fixup some method documentation return types"