Merge "Remove redundant null check."