use gcr.io instaed of launcher.gcr.io URL

Change-Id: I40e9d964d3579323a2560a0408a19444e54ea3e9
diff --git a/bazelrc/bazel-0.10.0.bazelrc b/bazelrc/bazel-0.10.0.bazelrc
index 3ad6578..3fcab81 100644
--- a/bazelrc/bazel-0.10.0.bazelrc
+++ b/bazelrc/bazel-0.10.0.bazelrc
@@ -33,7 +33,7 @@
 build:remote --host_javabase=@bazel_toolchains//configs/debian8_clang/0.3.0:jdk8
 build:remote --javabase=@bazel_toolchains//configs/debian8_clang/0.3.0:jdk8
 build:remote --crosstool_top=@bazel_toolchains//configs/debian8_clang/0.3.0/bazel_0.10.0:toolchain
-build:remote --experimental_remote_platform_override='properties:{ name:"container-image" value:"docker://launcher.gcr.io/google/rbe-debian8@sha256:b2d946c1ddc20af250fe85cf98bd648ac5519131659f7c36e64184b433175a33" }'
+build:remote --experimental_remote_platform_override='properties:{ name:"container-image" value:"docker://gcr.io/cloud-marketplace/google/rbe-debian8@sha256:b2d946c1ddc20af250fe85cf98bd648ac5519131659f7c36e64184b433175a33" }'
 
 # Set various strategies so that all actions execute remotely. Mixing remote
 # and local execution will lead to errors unless the toolchain and remote
diff --git a/bazelrc/bazel-0.9.0.bazelrc b/bazelrc/bazel-0.9.0.bazelrc
index 4a59ba2..47ece43 100644
--- a/bazelrc/bazel-0.9.0.bazelrc
+++ b/bazelrc/bazel-0.9.0.bazelrc
@@ -33,7 +33,7 @@
 build:remote --host_javabase=@bazel_toolchains//configs/debian8_clang/0.2.0:jdk8
 build:remote --javabase=@bazel_toolchains//configs/debian8_clang/0.2.0:jdk8
 build:remote --crosstool_top=@bazel_toolchains//configs/debian8_clang/0.2.0/bazel_0.9.0:toolchain
-build:remote --experimental_remote_platform_override='properties:{ name:"container-image" value:"docker://launcher.gcr.io/google/rbe-debian8@sha256:496193842f61c9494be68bd624e47c74d706cabf19a693c4653ffe96a97e43e3" }'
+build:remote --experimental_remote_platform_override='properties:{ name:"container-image" value:"docker://gcr.io/cloud-marketplace/google/rbe-debian8@sha256:496193842f61c9494be68bd624e47c74d706cabf19a693c4653ffe96a97e43e3" }'
 
 # Set various strategies so that all actions execute remotely. Mixing remote
 # and local execution will lead to errors unless the toolchain and remote
diff --git a/configs/debian8_clang/0.2.0/toolchain.bazelrc b/configs/debian8_clang/0.2.0/toolchain.bazelrc
index e02b3da..201dd8f 100644
--- a/configs/debian8_clang/0.2.0/toolchain.bazelrc
+++ b/configs/debian8_clang/0.2.0/toolchain.bazelrc
@@ -2,4 +2,4 @@
 build:remote --host_javabase=@bazel_toolchains//configs/debian8_clang/0.2.0:jdk8
 build:remote --javabase=@bazel_toolchains//configs/debian8_clang/0.2.0:jdk8
 build:remote --crosstool_top=@bazel_toolchains//configs/debian8_clang/0.2.0/bazel_0.10.0:toolchain
-build:remote --experimental_remote_platform_override='properties:{ name:"container-image" value:"docker://launcher.gcr.io/google/rbe-debian8@sha256:496193842f61c9494be68bd624e47c74d706cabf19a693c4653ffe96a97e43e3" }'
+build:remote --experimental_remote_platform_override='properties:{ name:"container-image" value:"docker://gcr.io/cloud-marketplace/google/rbe-debian8@sha256:496193842f61c9494be68bd624e47c74d706cabf19a693c4653ffe96a97e43e3" }'
diff --git a/configs/debian8_clang/0.3.0/toolchain.bazelrc b/configs/debian8_clang/0.3.0/toolchain.bazelrc
index 8593537..73e19d5 100644
--- a/configs/debian8_clang/0.3.0/toolchain.bazelrc
+++ b/configs/debian8_clang/0.3.0/toolchain.bazelrc
@@ -2,4 +2,4 @@
 build:remote --host_javabase=@bazel_toolchains//configs/debian8_clang/0.3.0:jdk8
 build:remote --javabase=@bazel_toolchains//configs/debian8_clang/0.3.0:jdk8
 build:remote --crosstool_top=@bazel_toolchains//configs/debian8_clang/0.3.0/bazel_0.10.0:toolchain
-build:remote --experimental_remote_platform_override='properties:{ name:"container-image" value:"docker://launcher.gcr.io/google/rbe-debian8@sha256:b2d946c1ddc20af250fe85cf98bd648ac5519131659f7c36e64184b433175a33" }'
+build:remote --experimental_remote_platform_override='properties:{ name:"container-image" value:"docker://gcr.io/cloud-marketplace/google/rbe-debian8@sha256:b2d946c1ddc20af250fe85cf98bd648ac5519131659f7c36e64184b433175a33" }'