Merge "Fixes vts failure. Formats code."