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

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