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