Revert "Revert "Remove double unloading hack""

This reverts commit e9cae49599856fe737cee87783438d2c5dabccfe.

Bug: 28406866

(cherry picked from commit c0f2e678e45ff191f90651117f4e238caa521b80)

Change-Id: I806cec1a6baab8722262082a6d3db1ac3734a8ab
1 file changed