am: f1c25cf3 * commit 'f1c25cf3': Revert "Revert "Revert some flaky unloading"" Change-Id: I070b7693ee975c91de025ce8846c6e0fa439f7da