Merge "Remove null check because of guarantee of non-null"