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

Change-Id: Ieb521a2e25f9483d68d33a8c9d4b2d957da978c7