Merge "Merge "Fix tests for wait for internet flags." into main am: 6beeee510c am: a452e28799" into main