Javadoc cleanup (#15134)

Change-Id: If457da33cf5489c9b5cd552827fb60166599cd72