Merge "Avoid contention in updateLinksTimestamp()"