Cherry-pick the change from master for the setRPort in Via header.

Change-Id: Ib13825c94af0e4cfffbbb6ebc4ed264596b80c26
1 file changed