Merge "Revert isResolvingImsBinding implementation"