Merge "Revert "Revert^2 "Revert "Add CTS tests for exclude VPN routes A...""