Merge "Wait longer for data loading" into nyc-support-24.1-dev
am: 2bbe48b7d3

Change-Id: I52e15358c08ecbfee12afc6d9721cf68f4de8075