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

* commit '28d8b8c9882e501f95ec3076a4f1fffc759ea999':
  Fix race condition when collecting op callback.