Merge "Remove vvm_type_string for mmcmnc 23434" am: 3ae0bea8f5
am: 78f3dcf6d2

Change-Id: Ia3002a07e00d3c6f94c88780b9dcaeab56a1b2ab