Merge pull request #84 from benjaminp:fix-for-linkops

PiperOrigin-RevId: 339049823
Change-Id: Ia7550ae25cbe5bac936e86b458f7f322c6f258a0