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

Change-Id: Ia6676e28a6415df2f9d01a17db5f5bda2805858c