Merge "Add nullability anotations"