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

With go/aog/238641 this should pass on the buildbots again.

Bug: 28406866

This reverts commit 7dbf20abe99eb6c1d9c137e592c2025af725fa06.

Change-Id: I1038fe454491488fd561f5fce2e51a27487dce20
3 files changed