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

Change-Id: I1debf75171d081e5ab7c03da5354ed32f9d608ff