Merge "Javadoc fixes." am: 979936828f
am: 3cbe4cff5c

Change-Id: I77e7cf3e689fcfb94f97aa1ad41b40946ca6019a