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

* commit '6a9219026124f9075c03a861101cea985f01cdce':
  Workaround for busy wait bug