Fix IntentFirewall for 2.2.2