Merge "Don't loop forever on zero-length ICMPv6 ND options." am: e7128b10a8 am: 113d5f8f40 am: 6bcbb16630
am: f73df6370a

Change-Id: I4ca872c2e38f9513d0f5cb883a535f96a77afc76