am 73599f39: am f59830ff: Merge "Synchronize access to the annotation cache."

* commit '73599f39d3c9b14f0c698413c4b6be0357f156f6':
  Synchronize access to the annotation cache.