Revert "Revert "Revert "Revert "Revert some flaky unloading""""

Fugu is still unhappy

Bug: 28406866

This reverts commit 340f486aa0126facb67494449b5c2ee46a1a75e6.

Change-Id: I45fc77f924d991669d27b99c1458b2def8692664
3 files changed