Merge "Fix a resource clean-up routine" into rvc-dev am: a3cdc5697b am: a1bc34bef0

Change-Id: I86b2c5b46af350fea9ecc03d1d07d5fabc01fa65