Merge "Remove some sized based resource (match support lib removal)."