fix issues with drive sync


(cherry picked from commit 69ef145f)
1 job for new-master in 11 minutes and 17 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #79825
build

00:11:17