am ba8aa433: Merge "cleanup for concurrency"

* commit 'ba8aa433d5141e155eccba5640fc464228424efb':
  cleanup for concurrency