Merge "NPE fix in SyncStorageEngine"