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
am: 799ebbb3bc

Change-Id: Ie221c8b39311fdea1d1224b438b3f09116739929