Merge "NPE Fix in SyncStorageEngine" into nyc-dev