Causes another race condition This reverts commit 69515b22. Bug: 62147987 Change-Id: Ibe6f9bc14ed6cc35d3a23d52300657eaed9bb6d8