am f422dc49: Merge change 2566 into donut

Merge commit 'f422dc495ae092e8354b383a21f47b43ea698939'

* commit 'f422dc495ae092e8354b383a21f47b43ea698939':
  Fix javadoc typos. No code changes.