Merge "Remove double unloading hack"
am: 0cba5b3c02

* commit '0cba5b3c02e534b8e6edc1a06e86b4d8277b6acb':
  Remove double unloading hack

Change-Id: I4e20db897156085e967491de8b6ae0fb4d6b3d40