Prep zip to OTA

Change-Id: I2b1d8630dc37803a00b0e3d6115902837b403f9e
Merge "Prep zip to OTA" into jb-mr2