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