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

Change-Id: I6f7067c2f20ffa4366a99477057339f29f4ba6f0