Merge "Add IntentFilter auto verification - part 12" into mnc-dev