Merge "Generete .vts files on demand." am: 8c653834ee am: 4b3c6547b4
am: 4ac5ffd153

Change-Id: I39c93e67975d95bff5964e959e69ea90f82ef846