Merge "Ignore non-voice message SYNC event" into nyc-mr1-dev