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

Change-Id: Ibc51aaeba53a19d5550804d1d7f04e3e566a32ec