Merge "Revert "Revert "Revert some flaky unloading""" am: f1c25cf31d
am: b9a23b2048

* commit 'b9a23b2048812c33043cc5358ac489c60ef212e1':
  Revert "Revert "Revert some flaky unloading""

Change-Id: Ia1850edba1f6c5133c692397875a9c89b511d287