Merge "Remove unwanted timeout fallback to Legacy GA"