Merge "Reduce advertised ipv6 mtu by 16 to fit ethernet header" am: b1ad41b62e am: 376e086fef am: f0fff78d9d

Change-Id: I2ce8d87603b1628735b376efe21da43d3ea53225