Merge "DO NOT MERGE Close hole in synchronize-protected member variable." into jb-dev