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

Change-Id: Ic3e39189aa3b84289020ac564fb4ce0794a2cbb7