Merge "Fix zip slip vulnerability (CCSDK-3376)"