Merge "Remove tc id from leak in AOSP" into main