Merge "OPP: Fix Resource Leak in OPP (2/2)"