Merge "cloudbuild:  Update the build version to be the same as run version." into main