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

* commit '55554a9c0a5ea80b0a6e361be75944d560e75197':
  Revert "Revert some flaky unloading"

Change-Id: Iaf3b1b12472c5cd12eca2a2301f8e070953d5d8b