Merge "Mark @Nullable annotation to String parameter"