Merge "Updated build-model prebuilt following split changes." into studio-1.0-dev