Merge "Workaround for busy wait bug" into mnc-dr-dev
am: d34cf6d95c

* commit 'd34cf6d95c9e5b2d5464a1d8704d8ba7eb059216':
  Workaround for busy wait bug