Merge "Turn MessageBlobStore into a singleton instead of static functions"