Merge "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: c038bb4280" into oc-dr1-dev-plus-aosp
am: 37b0cae5a8

Change-Id: I1ad1b0c309de589c9f960b0287cdba5f54d61422