Merge "Revert some flaky unloading" am: 718d4e2698
am: 2558414742

* commit '25584147427cb1cbc12352d83b1183c07b60ae2c':
  Revert some flaky unloading

Change-Id: I9f088faa4a8f5ce20590b4b3f7e3d640161cec85