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

* commit 'dd185b657dba19e913e0e01a8213756fdd8e4cfc':
  Fix javadoc.