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