am ec3a2157: Merge "Fix racy DCHECKS."
am ec3a2157: Merge "Fix racy DCHECKS."

* commit 'ec3a2157d2a3e8bcfb34e9a2f2aa54254a8eec19':
  Fix racy DCHECKS.

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst