Merge \"Ignore non-voice message SYNC event\" into nyc-mr1-dev
am: 13c7d4c7ff

Change-Id: If2096e941c577616a1ad9f66d95aaeafc46042a5