am 179048ca: Merge "Update builder-model prebuilt to incoroporate latest changes" into idea133 automerge: c9babba

* commit '179048ca1def56587154757453df7a3f0656b798':
  Update builder-model prebuilt to incoroporate latest changes