Zero uninitialized field in conversion and fix vts bug
am: 36665b1b3d

Change-Id: Ib9c7e171da1b1acae16cb550dc1ed7d1cc635c77