Merge pull request #1221 from eustas:matJ

PiperOrigin-RevId: 695692377