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

Change-Id: I174d13d97cb54760688e5b4cd1fe79e1a5553e9f