Merge for null pointer fix in SafeBlobstoreOutputStream