Merge "Add nullability annotations for functions called by updateLinkProperties"