Workaround for Atmosphere race condition (#13528)

Change-Id: I39cb72ef9a1f6c6424dce7f9feff2cebbfe3fdfd