Merge "Revert "Revert some flaky unloading"" am: 55554a9c0a
am: 1689fad0df

* commit '1689fad0df10fb17a14d7c125715ed97cc09e41e':
  Revert "Revert some flaky unloading"

Change-Id: Ie959ff18132cc89f093c9bab350df03e32bc3b79