Merge "[ExternalStore] Refactored external store classes to use a base class."