Fix a concurrency bug that ends up in a crash.

Bug: 18085768
Change-Id: I016bec997787839526ddfc521ebb99d0c7b05189
1 file changed