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

Change-Id: I588e21de6e4a369d9d37d7d206b5e791752c1904