am 8d25fba8: Merge "DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition" into jb-mr2-dev

* commit '8d25fba83872b1806c6c21569fce7c87b50257df':
  DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition