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

* commit 'f7ae26a1a13c52f1d1bb0f9214d613334ed63550':
  DO NOT MERGE Close hole in synchronize-protected member variable.