Merge "fix javadocs b/14414251" into klp-modular-dev