Merge "Remove @return from void API javadoc"