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

* commit '19a31b9656ec89ac273ba97277168728f2e027bb':
  Workaround for busy wait bug