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

Change-Id: I2f9319cccd4cb91a3550b7c45bb93025628c3de8