Merge "RTP: Prepare to unhide the APIs."