Merge changes from topic 'build-vts-zip' am: d0c693ff64 am: a50ead8336 am: d63d5fffcd
am: 0f74b8a26b

Change-Id: I9c13c4f105e7ee952cdd3ecc10bce9791a89000c