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

Change-Id: I17fe125bacb15f85706425c3267896a240073d94