Merge "Fix NPE in SyncMessage" into nyc-mr1-dev