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

Change-Id: I29926177d6e8c76ed715997d1e548ed18e569274