Simplify interlanguage links creation by early return

Change-Id: I023ac75ec7bce1996da50af78912dc990e69ad4d
Merge "Simplify interlanguage links creation by early return"