Merge "Update builder-model prebuilt." into idea133