Merge "Don't complain that the DNSSL RA option is "unknown"."
am: 8055ea44de

Change-Id: Id3553fdaca4b852330026f3083ec34a21b12ec54