Merge "Check frame handle validity before freeing buffer." into oc-dev
am: c9d2ceb9c2

Change-Id: I8d1dafc03a9a4bd9fdae836361298c9bf7890df3