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

Change-Id: I113d6d04f01f61be1e5837c13bf9d51731caab55