Merge "Wrapped call to notifyAll() in a synchronized block" into jb-mr1-dev