Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev
am: ce2cdf02bd

Change-Id: I06aec170231079b7a5155d25974db2d356aab410