am cbb0e809: Merge "Use reader lock of bulk free lock when not freeing."

* commit 'cbb0e809c0a4e8a4e8b7f5d3768a1864cfb381bb':
  Use reader lock of bulk free lock when not freeing.