Merge "Make zip available to product and vendor am: 10917f63ba am: 423af86c1e am: e6f80ff669 am: 493fe954f7 am: cb1cf7b117"