am 4b560d4a: Cherrypick the change for setRPort() in Via header.

Merge commit '4b560d4afc829c2cd4f03ee7011acfb36fe14f2c'

* commit '4b560d4afc829c2cd4f03ee7011acfb36fe14f2c':
  Cherrypick the change for setRPort() in Via header.