Merge "Replace "Comment" to "Description" since description makes more sense in the context of the java doc." into lmp-dev