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

Change-Id: I3929837b71d37bac7ffb3833f360ff8208f79458