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

Change-Id: I38ba45068c00c0948f561a788a7015ed250d62b6