Merge "Fix -Wnullable-to-nonnull-conversion error"