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

Change-Id: I98005a8294225b9eb7ca991bfb5e9d31de258256