7034940: message drop 2 translation integration

Reviewed-by: yhuang
4 files changed