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

Change-Id: I9a86f17485a6a360638da5014a793b7a1d922273