Merge \"Revert \"Revert \"Revert \"Revert \"Revert some flaky unloading\"\"\"\"\"
am: afb0f387fa

Change-Id: I9f67e24d1fdfb816739ba1b12e8bce300cfdfd81