Merge "NPE check in the SyncStateContract BUG:5196483"