Merge "Merge "Check frame handle validity before freeing buffer." into oc-dev am: c9d2ceb9c2 am: 41779c4849" into oc-dr1-dev-plus-aosp
am: 2c98a3b273

Change-Id: Iff1cc173408728da87f882b46ebbf6a89212b5c0