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

Change-Id: Id34010ca63365ae9a583fda197df3a74c7c8fe1a