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

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