am 8009e382: Merge "fix javadocs b/14414251" into klp-modular-dev

* commit '8009e3823c35c7f58a1b5bd0857e50723e593e9b':
  fix javadocs b/14414251