Merge "[AWARE] VTS baseline" am: 89145d5849 am: 8d875546a3
am: 0bd07635e4

Change-Id: I98751b7b94f9989a5a7cb13441e56f3d1aecd709