Merge "Moved MessageBlobStore to /cache"