Merge "Fix addOperationAuthTokenIfNeeded lookup"