Merge "Workaround for busy wait bug"
am: 140359b74d

* commit '140359b74d00895d53e89e4f3be542fc66351f34':
  Workaround for busy wait bug