Merge changes from topic 'vts_deps' am: 7d149a564f am: 7f8774ef80
am: 3b84dc5c78

Change-Id: I00c00e9e48d0275a78fb8914fdbc85de10b0d060