Merge "Refactor SH ServiceDataStoreOperationsImpl"