Merge "Fix VTS CTS-on-GSI missing vts" into oc-dev
am: b7d50ec906

Change-Id: I5fdbcefae632b6f4ca22b473ce8143c73025e363