Merge "Even more javadocs for telecom." into lmp-mr1-dev