Merge "Duplicate small time zone files in runtime apex"
am: c4252f49a0

Change-Id: Ib58fffc51108fb2169c66b54e0de099eebb0828d