Merge "DO NOT MERGE APF: also drop any ICMPv6 RSs" into nyc-mr2-dev