Merge "Revert some flaky unloading"
am: 718d4e2698

* commit '718d4e269810c17d03df909c84b2f7bbd4f61fb9':
  Revert some flaky unloading

Change-Id: Iebc6273df09d24397e8c7fa09de91d7562bd0284