Merge "Fix broken java doc. DO NOT MERGE" into lmp-dev