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