Merge "Remove inconsistent @Deprecated behavior in *removed.txt files" into main