Merge "[AWARE] VTS baseline"
am: 89145d5849

Change-Id: If4b0b17e1c5867835ec412f7e063f45c52bc4e97