Merge \\"Fix NPE in SyncMessage\\" into nyc-mr1-dev am: 259a1ec21b
am: be14855907

Change-Id: Ic2085cbdc49024a0884239d72a9014412a4335db