Merge "Add NonNull in Carriers constant"