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

Change-Id: I7e552a80892b02274c77066db556f0d7794847a0