am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"

* commit 'f325103356c559d6378da7fb7db3b2a49aba5d13':
  Framework/base: Added synchronization block to avoid race condition