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

Change-Id: I2feadb839300ff7d95fd125cda3ae2899c58f163