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

* commit '2eb225313de241d02979c66e2730983901ad05ea':
  Workaround for busy wait bug