Merge "Vts: refactor decoder code"