Merge "Javadoc fixes."
am: 979936828f

Change-Id: I72bfe87993c032b093c077c9a6c3daf81da09d12