Merge \"Revert \"Revert \"Revert \"Revert some flaky unloading\"\"\"\"
am: 9d6f786b83

Change-Id: I17aaa8ca2f7e63c22661c109b448a323dcb00485