Merge "Mark arg to NC#appliesToUidRange non-null"