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

* commit '2d15fcab3e3588cfddb6c7b180faecd3eccce2e5':
  reduce PB size from 2MB to 512KB