Merge "Use IPv6 hop limit from upstream interface." am: 53f6d1b060
am: 30a90a4e15

Change-Id: I9d3cca6e7a2963de13153ae21fd6a328d0a7025c