Merge "Tune blob-generation scripts" into jb-mr1-dev