Merge "Update SyncStorageEngine to use protos."