Merge "Add columns to namespace for vts target base test invocation" am: 7d32288474
am: 1639a26255

Change-Id: Ib1202ed705515234ff5e117d71d8ca4a7cdcc273