yanniszark: Cherry pick 3857 to v0.6-branch

JobBuild
7da417ac
08-21 18:45
a3e043d4
08-16 22:52
6ac20b04
08-14 14:11
91782708
08-13 13:30
kubeflow-presubmit 1164603897952604163 1164245659742638080 1162496981084409856 1161640984262479876 1161640612546482176 1161305623388753920 1161268250168791040