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

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

Change-Id: I070b7693ee975c91de025ce8846c6e0fa439f7da