Merge "Fix Os.link apicheck breakage."