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

Change-Id: I89234379d09ddac8ea5aa629bb360d450fe9ee49