Merge "Fix 616-cha-unloading."
am: c14f54b6d3

Change-Id: I99e1c7f626ef218d5382e6ca4cfb5a18baaf9db2