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

Change-Id: I409e26a885e5361a23c6bbae9c8fc994e45f7fcd