am 12522e01: am bfc58846: Merge "Update builder-model prebuilt." into idea133 automerge: 6238c27

* commit '12522e01c96f5d86bb775156a0eff8df635aa345':
  Update builder-model prebuilt.