diff --git a/google/cloud/bigquery/datatransfer/v1/bigquerydatatransfer_gapic.yaml b/google/cloud/bigquery/datatransfer/v1/bigquerydatatransfer_gapic.yaml
index 768971f5..eab51d4b 100644
--- a/google/cloud/bigquery/datatransfer/v1/bigquerydatatransfer_gapic.yaml
+++ b/google/cloud/bigquery/datatransfer/v1/bigquerydatatransfer_gapic.yaml
@@ -9,11 +9,11 @@ language_settings:
   go:
     package_name: cloud.google.com/go/cloud/bigquery/datatransfer/apiv1
   csharp:
-    package_name: Google.Cloud.Bigquery.Datatransfer.V1
+    package_name: Google.Cloud.BigQuery.DataTransfer.V1
   ruby:
     package_name: Google::Cloud::Bigquery::Datatransfer::V1
   php:
-    package_name: Google\Cloud\Bigquery\Datatransfer\V1
+    package_name: Google\Cloud\BigQuery\DataTransfer\V1
   nodejs:
     package_name: datatransfer.v1
 # The configuration for the license header to put on generated files.
diff --git a/google/cloud/bigquery/datatransfer/v1/datatransfer.proto b/google/cloud/bigquery/datatransfer/v1/datatransfer.proto
index 3c331ecd..d92b8f42 100644
--- a/google/cloud/bigquery/datatransfer/v1/datatransfer.proto
+++ b/google/cloud/bigquery/datatransfer/v1/datatransfer.proto
@@ -28,6 +28,8 @@ option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/datatr
 option java_multiple_files = true;
 option java_outer_classname = "DataTransferProto";
 option java_package = "com.google.cloud.bigquery.datatransfer.v1";
+option csharp_namespace = "Google.Cloud.BigQuery.DataTransfer.V1";
+option php_namespace = "Google\\Cloud\\BigQuery\\DataTransfer\\V1";
 
 // The Google BigQuery Data Transfer Service API enables BigQuery users to
 // configure the transfer of their data from other Google Products into BigQuery.
diff --git a/google/cloud/bigquery/datatransfer/v1/transfer.proto b/google/cloud/bigquery/datatransfer/v1/transfer.proto
index c0d62b6d..488a29e6 100644
--- a/google/cloud/bigquery/datatransfer/v1/transfer.proto
+++ b/google/cloud/bigquery/datatransfer/v1/transfer.proto
@@ -22,6 +22,7 @@ import "google/protobuf/timestamp.proto";
 import "google/rpc/status.proto";
 
 option csharp_namespace = "Google.Cloud.BigQuery.DataTransfer.V1";
+option php_namespace = "Google\\Cloud\\BigQuery\\DataTransfer\\V1";
 option go_package = "google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1;datatransfer";
 option java_multiple_files = true;
 option java_outer_classname = "TransferProto";
diff --git a/google/cloud/oslogin/oslogin_gapic.yaml b/google/cloud/oslogin/oslogin_gapic.yaml
index f88a0ac4..c6149e7f 100644
--- a/google/cloud/oslogin/oslogin_gapic.yaml
+++ b/google/cloud/oslogin/oslogin_gapic.yaml
@@ -9,11 +9,11 @@ language_settings:
   go:
     package_name: cloud.google.com/go/cloud/oslogin/apiv1beta
   csharp:
-    package_name: Google.Cloud.Oslogin.V1beta
+    package_name: Google.Cloud.OsLogin.V1Beta
   ruby:
     package_name: Google::Cloud::Oslogin::V1beta
   php:
-    package_name: Google\Cloud\Oslogin\V1beta
+    package_name: Google\Cloud\OsLogin\V1beta
   nodejs:
     package_name: oslogin.v1beta
 # The configuration for the license header to put on generated files.
diff --git a/google/cloud/oslogin/v1beta/oslogin.proto b/google/cloud/oslogin/v1beta/oslogin.proto
index 19cb5eec..ee26eed2 100644
--- a/google/cloud/oslogin/v1beta/oslogin.proto
+++ b/google/cloud/oslogin/v1beta/oslogin.proto
@@ -25,7 +25,8 @@ option go_package = "google.golang.org/genproto/googleapis/cloud/oslogin/v1beta;
 option java_multiple_files = true;
 option java_outer_classname = "OsLoginProto";
 option java_package = "com.google.cloud.oslogin.v1beta";
-
+option csharp_namespace = "Google.Cloud.OsLogin.V1Beta";
+option php_namespace = "Google\\Cloud\\OsLogin\\V1beta";
 
 // Cloud OS Login API
 //
diff --git a/google/devtools/cloudbuild/v1/cloudbuild.proto b/google/devtools/cloudbuild/v1/cloudbuild.proto
index a669ba84..fc52d6a9 100644
--- a/google/devtools/cloudbuild/v1/cloudbuild.proto
+++ b/google/devtools/cloudbuild/v1/cloudbuild.proto
@@ -687,6 +687,18 @@ message BuildOptions {
     VERIFIED = 1;
   }
 
+  // Supported VM sizes.
+  enum MachineType {
+    // Standard machine type.
+    UNSPECIFIED = 0;
+
+    // Medium size.
+    N1_HIGHCPU_8 = 1;
+
+    // Large size.
+    N1_HIGHCPU_32 = 2;
+  }
+
   // Specifies the behavior when there is an error in the substitution checks.
   enum SubstitutionOption {
     // Fails the build if error in substitutions checks, like missing
@@ -716,6 +728,17 @@ message BuildOptions {
   // Requested verifiability options.
   VerifyOption requested_verify_option = 2;
 
+  // GCE VM size to run the build on.
+  MachineType machine_type = 3;
+
+  // Requested disk size for the VM that runs the build. Note that this is *NOT*
+  // "disk free"; some of the space will be used by the operating system and
+  // build utilities. Also note that this is the minimum disk size that will be
+  // allocated for the build -- the build may run with a larger disk than
+  // requested. At present, the maximum disk size is 1000GB; builds that request
+  // more than the maximum are rejected with an error.
+  int64 disk_size_gb = 6;
+
   // SubstitutionOption to allow unmatch substitutions.
   SubstitutionOption substitution_option = 4;