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

Change-Id: I39a4f2a99a52973193247340f1eae980a4e9bf8f