Merge "Add thread safety documentation" am: b3ea05a56e
am: f19a33a070

* commit 'f19a33a0704d0e605c0a5206fe5df3ab7dbf6864':
  Add thread safety documentation