Merge "Minor corrections to the javadoc overview to reflect late API changes." into jb-dev