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

Change-Id: I827f0ad4c60f7fcc0b470b597ebaacfc0fc7dac7