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

Change-Id: I33636b9758deb22d1da5e9335d97babb73fdde85