Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread