Merge "Fix IntentFilterVerificationTest"