Merge "Cleanup pass for support-v4 split."