Merge "reduce PB size from 2MB to 512KB" into jb-dev