Merge "Fix bug 35841603: updating zip with invalid extra" into studio-master-dev am: 9a5309c7a2 am: df3747fb am: d517da5e am: e644e81a Change-Id: I22c924fd40df4cefc49fc06096c805e5c81c68fe