am: b9a23b20 * commit 'b9a23b20': Revert "Revert "Revert some flaky unloading"" Change-Id: Ia1850edba1f6c5133c692397875a9c89b511d287