Merge "Fix javadoc." into lmp-mr1-dev
automerge: 8b26674

* commit '8b26674aa139965005ff3ba7d284d7d557c2de61':
  Fix javadoc.