Merge "Add additional checks for overriding ABI for apps"