am 3f0ac62e: (-s ours) am f7ae26a1: Merge "DO NOT MERGE Close hole in synchronize-protected member variable." into jb-dev

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