Merge "Fix race condition when collecting op callback." am: 98844a97d2
am: 678011854b

* commit '678011854b0969f5fe69d597911beabcadcb03e8':
  Fix race condition when collecting op callback.