Merge "Minor change to JavaDoc" into lmp-mr1-ub-dev