Merge "Fix attention service resolution timing"