Merge "Fix javadoc attr reference." into lmp-dev