Fix race condition and missing await.
Fix race condition and missing await.

Osmose/normandy,Osmose/normandy,Osmose/normandy,Osmose/normandy,mozilla/normandy,mozilla/normandy,mozilla/normandy,mozilla/normandy