Merge "Speed up *TS zip file creation" am: 6d0f949296
am: 83667a3821

Change-Id: I7d2bb29787dc475e6b29493c5d81a5482b8e727e