Merge "Reland "Remove legacy/O/O-MR1 matrices.""