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

Change-Id: Ie41d6da6b93af6c76123437c0b26984c297a8b27