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

Change-Id: Iad4fb4b71eaa81e3535d0e0d2a3bfb7018ddda05