Fix destroy race condition

 Bug: 5246901

Change-Id: I97a211b23afb17314d7a37779593556529be7e32
1 file changed