Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev