Merge "Update the bug component for blobstore" into main