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

Change-Id: I70780ebd72fc756a28d1d46ad4a029c29a75f9c4