Merge "Merge "Ensure weakly referenced callback fields are kept" into tm-qpr-dev am: 71d0f222f1" into tm-qpr-dev-plus-aosp