Merge "Attempts to optimistically bind to AIA resolver"