Merge "RTP: update javadocs."