Merge changes from topic "vts-fix"
am: 5ddf91b992

Change-Id: Iaf0ea14f0adc45a4f7c07c9c96290eba675889fd