Merge "Fix braino in RTP."