Merge "Cleaning code related to the forwarding intent filters."