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