Fix deadlock on RS teardown.

Change-Id: I34d2702b535e28e9519c7368fd8a942bfe0724bc
1 file changed