Merge change 3642 into donut

* changes:
  Use the same lock for Sdk class than the one used for loading the SDK.