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