am: 55554a9c * commit '55554a9c': Revert "Revert some flaky unloading" Change-Id: Iaf3b1b12472c5cd12eca2a2301f8e070953d5d8b