am 1254b9c5: am cd386649: Merge "RTP: Revise the workaround of private...
am 1254b9c5: am cd386649: Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread
Merge commit '1254b9c5'
* commit '1254b9c5':
RTP: Revise the workaround of private addresses and fix bugs.