Merge "Updated build-model prebuilt following split changes." into studio-1.0-dev automerge: 75c5f99
automerge: 395bcd1

* commit '395bcd1681b3d0271fbcc56d9e339060ae18d66b':
  Updated build-model prebuilt following split changes.