Merge "Fix AssistDataRequesterTest Flakiness" into main