Merge "Don't trigger MessageBlobStore during tests"