Merge "Cleaner VTS for wider use" into oc-dr1-dev am: c127be33b9
am: d3abdfef62

Change-Id: I5da2d9a21cec8b91e08077967fe2d532fb46d75e