Merge "Fix the vts error" into qt-dev
am: 07b0f138a1

Change-Id: I58c5f6f671d03e0a61feac7fa89f6ea8a1c8624f