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