am 792de31d: Merge change 3642 into donut

Merge commit '792de31db045e053b154f0e6068f692637f75612'

* commit '792de31db045e053b154f0e6068f692637f75612':
  Use the same lock for Sdk class than the one used for loading the SDK.