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

Change-Id: Ib0629ffee37feb9ed1311a7bcdf31b57a5912791