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

Change-Id: Idcb4ef749ef42113a6f37ba4e3bf6b025581e5a6