Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am: ce2cdf02bd am: c36cdf16a9 am: 389c6ede46 am: fd175e7f88 am: dce2faae4f  -s ours
am: 747c025ebf

Change-Id: Id540ca0eda77b3e04a33289a26f53646afe9dbc6