Merge "Replace transcription for unsupported VVM message type" into nyc-mr1-dev
am: d250570f42

Change-Id: I3b21aaae8f021c9d333665c166987dd237e7a865