Merge "Fix AssistDataRequesterTest"