Merge "Remove unnecessary assert and value assignment"